Merge "Set context earlier in UploadForm::__construct"